tpmback compilation fix.

A small patch to fix some compilation problems and debugging output.
Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/linux-2.6-xen-sparse/drivers/xen/tpmback/tpmback.c b/linux-2.6-xen-sparse/drivers/xen/tpmback/tpmback.c
index ab79feb4fc94b4578163b6c68e6a2f6377513e31..1caaca4998a3518c8a924daad2e8e8fc3c7f209c 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/tpmback/tpmback.c
+++ b/linux-2.6-xen-sparse/drivers/xen/tpmback/tpmback.c
@@ -40,7 +40,6 @@ struct packet {
        u8 req_tag;
        u32 last_read;
        u8 flags;
-       ctrl_msg_t ctrl_msg;
        struct timer_list processing_timer;
 };
 

diff --git a/linux-2.6-xen-sparse/drivers/xen/tpmback/xenbus.c b/linux-2.6-xen-sparse/drivers/xen/tpmback/xenbus.c
index a4f75ca0271f883a64aea63d64ff275b8a7a6e97..4e2a11f8380d6fb7506507dc892c9de90cfae624 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/tpmback/xenbus.c
+++ b/linux-2.6-xen-sparse/drivers/xen/tpmback/xenbus.c
@@ -83,7 +83,7 @@ static void frontend_changed(struct xenbus_watch *watch, const char *node)
                            "event-channel", "%u", &evtchn, NULL);
        if (err) {
                xenbus_dev_error(be->dev, err,
-                                "reading %s/grant-id and event-channel",
+                                "reading %s/ring-ref and event-channel",
                                 be->frontpath);
                return;
        }